Remove debian/patches/fix-big-endian-build.diff

diff --git a/debian/changelog b/debian/changelog
index 0b8a76558448c9ec7ea120f4b3ed6ea409d01910..808027b929e921918687df2d50ad21d68a76555b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ opencc (0.3.0-1) unstable; urgency=low
 
   * New upstream release
   * Remove autotools-dev and quilt from Build-Depends
+  * debian/patches/fix-big-endian-build.diff: merged upstream
 
  -- Kan-Ru Chen <koster@debian.org>  Sat, 17 Dec 2011 16:41:49 +0800
 

diff --git a/debian/patches/fix-big-endian-build.diff b/debian/patches/fix-big-endian-build.diff
deleted file mode 100644 (file)
index fe40028..0000000
--- a/debian/patches/fix-big-endian-build.diff
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/src/encoding.c
-+++ b/src/encoding.c
-@@ -130,11 +130,7 @@
-                       pucs4 = ucs4 + freesize;
-               }
- 
--              #if BYTEORDER == LITTLE_ENDIAN
--                      *pucs4 = (byte[3] << 24) + (byte[2] << 16) + (byte[1] << 8) + byte[0];
--              #else
--                      *pucs4 = (byte[0] << 24) + (byte[1] << 16) + (byte[2] << 8) + byte[3];
--              #endif
-+              *pucs4 = (byte[3] << 24) + (byte[2] << 16) + (byte[1] << 8) + byte[0];
- 
-               pucs4 ++;
-               freesize --;
-@@ -174,13 +170,8 @@
-               ucs4_t c = ucs4[i];
-               ucs4_t byte[4] =
-               {
--              #if BYTEORDER == LITTLE_ENDIAN
-                       (c >> 0) & BITMASK(8), (c >> 8) & BITMASK(8),
-                       (c >> 16) & BITMASK(8), (c >> 24) & BITMASK(8)
--              #else
--                      (c >> 24) & BITMASK(8), (c >> 18) & BITMASK(8),
--                      (c >> 8) & BITMASK(8), (c >> 0) & BITMASK(8)
--              #endif
-               };
-               
-               size_t delta = 0;

diff --git a/debian/patches/series b/debian/patches/series
index 703b2c9ec1816fd6097a8db36cc98ae553cf10a1..8b137891791fe96927ad78e64b0aad7bded08bdc 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-fix-big-endian-build.diff
+